From 318f017d7ed8bce76bab26b06a752bf5a6d602c5 Mon Sep 17 00:00:00 2001 From: "adsharma@linux-t08.sc.intel.com" Date: Thu, 17 Feb 2005 23:06:46 +0000 Subject: [PATCH] bitkeeper revision 1.1221 (42152386hyIe9n6VsIczTLskp4VGvg) xensetup.c: Rename cli/sti to local_irq_disable/enable --- BitKeeper/etc/logging_ok | 1 + xen/arch/ia64/xensetup.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index cc61e097c9..35236489aa 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,6 +1,7 @@ ach61@boulderdash.cl.cam.ac.uk ach61@labyrinth.cl.cam.ac.uk ach61@soar.cl.cam.ac.uk +adsharma@linux-t08.sc.intel.com akw27@arcadians.cl.cam.ac.uk akw27@boulderdash.cl.cam.ac.uk akw27@labyrinth.cl.cam.ac.uk diff --git a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c index 5515b3bf34..e8d779ecc1 100644 --- a/xen/arch/ia64/xensetup.c +++ b/xen/arch/ia64/xensetup.c @@ -20,7 +20,6 @@ //#include //#include #include -#include //#include //#include //#include @@ -281,7 +280,7 @@ void cmain(multiboot_info_t *mbi) SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); printk("About to call scheduler_init()\n"); scheduler_init(); - cli(); + local_irq_disable(); printk("About to call time_init()\n"); time_init(); printk("About to call ac_timer_init()\n"); @@ -401,7 +400,7 @@ printk("About to call init_trace_bufs()\n"); #endif domain_unpause_by_systemcontroller(dom0); domain0_ready = 1; - sti(); + local_irq_enable(); printk("About to call startup_cpu_idle_loop()\n"); startup_cpu_idle_loop(); } -- 2.30.2